From: Keir Fraser Date: Tue, 4 May 2010 11:29:05 +0000 (+0100) Subject: vmx, tboot: Check the correct in/outside-SMX flag when init'ing VMX. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12276 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=d640a290f281704d8375ef388da53dbca9c1d248;p=xen.git vmx, tboot: Check the correct in/outside-SMX flag when init'ing VMX. Signed-off-by: Shane Wang Signed-off-by: Keir Fraser --- diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 171b595eab..c3bfaa9d25 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -376,8 +376,9 @@ int vmx_cpu_up(void) bios_locked = !!(eax & IA32_FEATURE_CONTROL_MSR_LOCK); if ( bios_locked ) { - if ( !(eax & (IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_OUTSIDE_SMX | - IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_INSIDE_SMX)) ) + if ( !(eax & (tboot_in_measured_env() + ? IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_INSIDE_SMX + : IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_OUTSIDE_SMX)) ) { printk("CPU%d: VMX disabled by BIOS.\n", cpu); return 0;